gtkwindow: Fix resize without "_GTK_FRAME_EXTENTS"
authorOlivier Fourdan <ofourdan@redhat.com>
Mon, 9 Nov 2015 11:05:37 +0000 (12:05 +0100)
committerBenjamin Otte <otte@redhat.com>
Mon, 9 Nov 2015 13:17:53 +0000 (14:17 +0100)
git commit a5b1cdd0 introduced a regression where CSD windows are not
resizable with metacity.

Reason being that metacity does not support "_GTK_FRAME_EXTENTS" and
therefore gtk_window_supports_client_shadow() would always return FALSE.

This explains why it works with window managers which support
"_GTK_FRAME_EXTENTS" such as mutter/gnome-shell or xfwm4.

Partially revert commit a5b1cdd0 to reinstate the logic in
get_shadow_width().

Bugzilla: https://bugzilla.gnome.org/show_bug.cgi?id=757805

gtk/gtkwindow.c

index 9c4fcb29dbf96aa198d179d522d379f05c9cd148..a76ea04d3b6fc079753a5feeaedb1aac5726ff5c 100644 (file)
@@ -6722,10 +6722,8 @@ get_shadow_width (GtkWindow *window,
   if (!priv->decorated)
     return;
 
-  if (!priv->client_decorated)
-    return;
-
-  if (!(gtk_window_should_use_csd (window) &&
+  if (!priv->client_decorated &&
+      !(gtk_window_should_use_csd (window) &&
         gtk_window_supports_client_shadow (window)))
     return;